extensionBase: Stop injecting extensionManager

All extension lookups now happen through the dedicated
Extension/ExtensionPreferences classes, so the shared
code no longer has to access the extensionManager.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2838>

diff --git a/js/extensions/extension.js b/js/extensions/extension.js
index cdbc33da75e51dbe675d1a30daac8007f0191303..2e06b3dfeb05f1751699230a09baeaa836619663 100644 (file)
--- a/js/extensions/extension.js
+++ b/js/extensions/extension.js
@@ -1,7 +1,6 @@
-import {ExtensionBase, GettextWrapper, setExtensionManager} from './sharedInternals.js';
+import {ExtensionBase, GettextWrapper} from './sharedInternals.js';
 
 const {extensionManager} = imports.ui.main;
-setExtensionManager(extensionManager);
 
 export class Extension extends ExtensionBase {
     static lookupByUUID(uuid) {

diff --git a/js/extensions/prefs.js b/js/extensions/prefs.js
index ab0a74dd25af47dede72f8ce7d7e30295fcd0476..d60859a3d7efc76ad0453a63a45ff9358a51ff99 100644 (file)
--- a/js/extensions/prefs.js
+++ b/js/extensions/prefs.js
@@ -1,10 +1,8 @@
 import GObject from 'gi://GObject';
 
-import {ExtensionBase, GettextWrapper, setExtensionManager} from './sharedInternals.js';
+import {ExtensionBase, GettextWrapper} from './sharedInternals.js';
 import {extensionManager} from '../extensionsService.js';
 
-setExtensionManager(extensionManager);
-
 export class ExtensionPreferences extends ExtensionBase {
     static lookupByUUID(uuid) {
         return extensionManager.lookup(uuid)?.stateObj ?? null;

diff --git a/js/extensions/sharedInternals.js b/js/extensions/sharedInternals.js
index ac6d035a84706d424a585a2873b6bfe7226ef52f..2f8e287105f86effc2939b942461793cb7c14c3c 100644 (file)
--- a/js/extensions/sharedInternals.js
+++ b/js/extensions/sharedInternals.js
@@ -6,18 +6,6 @@ import {bindtextdomain} from 'gettext';
 
 const Config = imports.misc.config;
 
-let _extensionManager = null;
-
-/**
- * @param {object} extensionManager to use in utilities like `initTranslations()`
- */
-export function setExtensionManager(extensionManager) {
-    if (_extensionManager)
-        throw new Error('Trying to override existing extension manager');
-
-    _extensionManager = extensionManager;
-}
-
 export class ExtensionBase {
     #gettextDomain;